build: Use the common linker flags in GDK and GSK
authorEmmanuele Bassi <ebassi@gnome.org>
Tue, 18 Apr 2017 14:16:28 +0000 (15:16 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Wed, 3 May 2017 14:10:56 +0000 (15:10 +0100)
Instead of hard-coding `-Bsymbolic`.

gdk/meson.build
gsk/meson.build

index 685d8540db017c23d9d8d413a88b1e8ad77c330a..1553f5ef1f4bffcd5e3422f552755744ede17306 100644 (file)
@@ -198,10 +198,11 @@ endforeach
 # FIXME: might have to add '-xobjective-c' to c_args for quartz backend?
 libgdk = static_library('gdk',
   sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
-  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'] + common_cflags,
+  dependencies: gdk_deps,
   include_directories: [confinc, xinc, wlinc],
+  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"'] + common_cflags,
   link_with: gdk_backends,
-  dependencies: gdk_deps)
+  link_args: common_ldflags)
 
 # We don't have link_with: to internal static libs here on purpose, just
 # list the dependencies and generated headers and such, for use in the
index 3ebcda9e95b34a25f72f80b9b73d812b4d30693a..28420127dcac59b24ec2154927c02a74d35412a7 100644 (file)
@@ -159,7 +159,7 @@ libgsk = static_library('gsk',
   include_directories: [confinc],
   c_args: ['-DGSK_COMPILATION', '-DG_LOG_DOMAIN="Gsk"'] + common_cflags,
   link_with: libgdk,
-  link_args: ['-Bsymbolic'])
+  link_args: common_ldflags)
 
 # We don't have link_with: to internal static libs here on purpose, just
 # list the dependencies and generated headers and such, for use in the